More vcmi fixes