Fix the SH and PP events