minor Fixes

fix vcstool/wstool#4, and minor other things