Volk bugs

This brings over a couple of the more useful commits from the volk repo.