additional changes for evervolv (from 1ceb0x)