Fix build failures related to the new ENV options in yml