Fix corrupt common/env