[env] misc updates