Feature config minor improvements