fixes to Vanilla commands