Fix 2 implicit ordering errors