vm: Make some tiny behaviour improvements.