Fixes for flat intertwinkles