More changes to make it compatible with php 5.3