Quick fixes on the header