Minor regex fixes