"Fixed" latest upstream code. Weird, it should build without these modifications...