Fixes for enable and config sample