sbtools: various fixes

Change-Id: I82c4642aea325cf22d66e9b49fc2d47319cd70eb
2 files changed