Small tweaks to make vbam run better