pa2 small fixes