Added missing key listeners