Missed a couple substitutions

Somehow I forgot to push up another couple changes on the last pull request.

Mea culpa.

David