Simplified the way header is resolved
Updated distributables