Amend environment checks