Misc cleanup
Added keyboard workaround