fmannhardt Fix issues with performance as secondary measure