Fix errors reported by bot