Fixes to work with booby 0.4.0

Hi,

I've update finch to work with the latest changes in booby. Can you please have a look and merge upstream?

Thx