Fixes for export to Advania