Completed setup script
Forgot our own patches