Additional improvements to the license handler. #2133