LS-61 - Fixed license handling issues.