Tool partial fixes

:fork_and_knife: A few minor fixes found during QA surrounding the tool partial.