PHP 5.5 fixes

Just some minor shuffling of the CVs