Fixes in deployment