Fix issue with building s2ve + s2vep