Fix two minor mix-ups

Authored by davidre on Wed, Mar 18, 6:44 PM.