Resolve the build issues so everything now correctly compiles