Minor Cafe tweaks