Use correct load order
Better TeamCity logging