Fix invalid stage name + hiding of body