More soft key fixes