Fixes for remaining keystrokes