Fixes to marker export