completion fixes and php plugins