Fix environment issues...