Compiling against latest upstream