php 5.5 related adjustments