various fixes/cleanup for the outbound flow controller.