Re: [development] Two performance improvements