Small fixes regarding regex