Perf fixes june 2014