Fixes issues with the header