Bug fixes relating to features.