Some minor ToolFeature changes