Reconsider some check logic on features