build env: fixes