Fixes for EVASS