Fixes for writing compliant SMF files