Merge "Perfprofd: Minor fixes"