SOME php 5.4 errors fixed, not all