General modifications before header design