Fix issues discussed in previous pull request