Fixes for new environments.