Fixed up issues with last commit