Making the make output more friendly
Correcting segfault induced by a change in env structure