Fixed Van class and spec, and other fixes