Fixed up issues with last commit

No match.