Shantel peters.

Results 2 issues of Shantel peters.

closes #1623

cla:signed