Fixups, custom layers.