Moar fixes in PHP