Fixing bugs related to deployment in live