Base: Fix support for firmware 1.8.3 and 2.0.0