Mostly look to be errors that existed before this PR. Co-authored-by: Endrik <enduslittlecomputer@gmail.com>