More fixes for wstool and private repos.