Updated to latest upstream versions