Fixes for feature systems