Fix custom headers