More keyboard binding tweaks