[core] Bug Fixes for Dean's load test