Fixes copy-paste errors uncovered by manual tests