small updates on env loading