Vanubi 0.0.2.2, various regression fixes