Fixes for changes to tools menu