Changed order of build tasks