Fix (?) PCRE problems