fix Performance Warnings