Small fixes to vm locator and validation presenter