Reorder fixes