Fixed (hopefully) ambigous namespace problems with MacOS compiler