Fixing some of the build errors