Security and licence issues fixes