Standby fixes (and that actually work!)