Re: more little bugfixes