[Core] Fixed a few more string comparisons