minor tweaks for VW compile