Re: shmc bug fixes