Add timeout for KeyReset
Misc forgotten files, things..