corrections for php specific settings
merge php specific changes