Re: [PATCH] Bugfixes