Fixing key commands