Some fixes to SXF