Fix more ENV Fixnum issues