fixes for bug 877262 - tested 'tools reload' and found some issues