AID-48 Fixes for example config