Fixing bugs reported by Brad Fromm from INL. Closes #128