Improvements to license manager on the client