[development] Two performance improvements