Fixed for a clean build

Some minor fixes for getting a success build on a clean environment