Fixed some errors in headers