Some regex tweaks