Adapted to latest ssvu (log system)