Update to latest upstream shit and adapt where necessary