Return php 5.3 support and some fixes