Evervolv 4.0.0p1 compilation fixes