more key fixes