Further SVACE fixes