Fix issues encountered in the deploy party

29 lines, 6 hours