Fixed potential parser issues.