Fixed "==" string comparison, removed compiler warnings