Further fixes to beans.