Performance Fixes