Fixed problems related to entry of certain keys