Change build setup to correctly build on first run