Small bugfixes. Use new shareResouce.