Missing visibility
Missing type
Fix typo in feature
Un-inline shuffle, to avoid reerence mismatch