Fixes setup and deployment