Minor changes
Adapted to newest ssvu