Fixes for CafeOwner logic