Minor fixes and support for clearenv in buildenv