Tweaks to (hopefully) support php 5.3