Fixed some issues with header