Fix errors reported by frosted in tests