More work on php 5.4 and 5.5.