Fixing key callbacks