Adopt cake3 and Uru changes