Corrected Percritic warnings