Fix some "Invalid input detected" issues.