Fix HVMs so they don't only work if the cluster you're on happens to have