Misc: Clean up xml imports and syntax error