Improved support for Buckaroo.