more regex compatibility fixes