Fix ordering in setup script