Clean up aliases
Set correct_all (fixes environment module)