Some fixes in headers