Cleanup from merge

Made changes to BOMTool and ITCapTool to handle previous changes (I hope
this doesn't ruin someone elses changes...)