More fixes in phing