Sort fixes, re-enable