Even more fixes to config.hpp