Fixed up some stuff related to features.