Overworking some small stuff that didn't work after the beans upgrade.