Fix short-cut keys