Put back default behaviour in more keys