Fix errors found by frosted.