Fixes to tool loading. This was annoying -.-