Minor Performance Adjustments