couple of key fixes