Fixes for header security