Fixed string+int issues in headers