Fixed validation issue, there was a minor environments bug that I also fixed