Fix tovtk and some more