Fixup and cleanup