added unmanaged dependencies
Some fixes