Bug fixes in share module