Further fixes for deployment