Some fixes for evervolv build