Some more berry handling