various deployment bug fixes