Fix some VeloType bugs