vcl::KeyCode fixes

Change-Id: I3504e3152ee3969f35c639807ac2fb0753a8aa62