more secret key fixes