various important fixes to deploy