Small improvements to codebase

I think this is what is causing the build to fail