Some tweaks to fix php 5.3 compatibility