Fixes for keyboard