Code review fixes - environinstance