Minor tweaks for vestiges