Fixing some other keycode / HTML issues