victor-pm:fix various issues