Fix php 5.4 issues