Fix some Critic issues