pavo: minor improvements