More performance and fix