Performance Testing Fixes