More critic fixes.
Critic level 4 fixes.