Misc hotkey fixes/additions