More sealer refactoring and fixes.