Fixes for deployment
Fixes for deployment