Fix copy-paste bugs introduced by previous commits