Fix errors from RedPen