fixes for mass licensing change