added changes for php55, part 2