1.2: Some PW 2.4 adjustments