Updates for php 5.4