Added some fixes for when there are no features.