firehose bug fixes