Fixes in headers