Fixes to get kazoo to compile