fixes for tools and examples