Fix some Vesta bugs