Some keyguard clock fixes