Make some changes to use autoenv.