Fix up issues in last commit