Fixing headers and errorstrings