Changes to make compatible with latest Vlang code.