Cleanup
Fix more discrepancies