Good catch -- both fixed