Clean up
Compat changes didn't stick, committing them again