Assorted optimisations / fixes / pedantries
Fixed issue with the headers