various deployment fixes