Fixed string+int issues in headers
Fixed equality comparison with extraneous parentheses