php 5.4 fixup done