Fixes to sakemore export.