more mods for compiling with the namespace change