Some final PHP5.3 fixes :-)