Fixes for Keymando 1.3.3b