NXIDE-241 Fixing backward compability (juno against indigo) compilation issues