Small bugfixes to go with share