Fixing up features.