Small Performance Improvements