Fix up features.