Re-add some imports and fix xml