Fix bad order of setup commands