Fixing project build order