Make enesim depend on 1.8 and fix some var use