Fixed Licencing issues