tidy up old bugs reported in instance startup