fix up configuration structs a bit more