More TeamCity build script fixes.