Fix bugs reported at SVACE