Dfoxpowell/bug fixes tues 9

bug fixes for launch blocking issues