More regex tweaks