Tweaks on websharks/hubflow#1 again.