Fixed some issues with string comparison