KBD drop fixes