Fix Compilation with Latest Upstream master