Quick and dirty fix for UnitApplication, fix in next iteration.