Fix to support latest environment changes from framework core.