KAZOO-80: tweaks for cross-account hunting
fix compile warning