Fix builds that reference vanir/gsm