Fix minor config/include fixes;