Updates for latest changes to eModeling
Fixed launcher