More 24 hour fixes