More critic level 4 fixes.