Fixes to work with booby 0.4.0