Simplify a few small issues due to split of schedule and launch