Fixing more keyboard implementation