Task fixes to handle deploy scenario w/ demo