header and compatibility layer updates