[Mac OS X][Keyboard] Few improvements and bug fixes.