more fixes in php support