Small fixes (performance issues + typo)