Fix requirements; now called from setup