Fix two small typos/bugs

Looks like the expiration year validation commit may have introduced a couple of typos.