Fix mistakes made in commit 23dc44df