Bug fix and change keyboard type