Base: Improve support for upcoming 2.0.8 firmware