Updated build so that teamcity will work correctly