Fixes to deployment
Simplying dependencies for build