Some more sleep fixes