Minor tweaks to feature set.