Fix #1393 and update other pf help messages