Fixup After and at_exit hooks
WIP use the :host strategy