Some fixes and unlocked sleep