Fixing the build isssues reported in the Bamboo