Expand on 2.6 module file and add env module file fixes for 2.6 and 2.7