Fix code-critic warnings