- futher fixes for header issues