some cake3 compat fixes