Updated build to get it working on build server