Fix feature-mode mapping