Fixing up some feature junk