Merge "Small fixes in tools." into jb-mr2-dev