Fixed several namespace conflicts that broke the build