Minor modifications to features, etc.