Couple of fixes to allow compilation with 1.1.3108 firehose release