Misc PHP changes