Fixed issues causing the build to break