Fixup before and after handling