Make headers a bit more friendly