Add another patch for a few campfire bugs (one of which is still in 0.34)