more package header tweaking