Fix errors per Hina's suggestion