Vanilla minor fixes