More sleep fixes