fixes for generating complete mar