BUG: Fix order of build tasks for initial build