Corrected minor performance catches