Fixing some regex