[vacuum]: small fixes