updated header manipulation for new core api
updated compat tests