Couple of minor warning fixes

[arun.raghavan@xxxxxxxxxxxxxxx (Arun Raghavan)]

Since Maarten's declared war on warnings, thought I'd pitch in with a
couple of fixes too. :) The first one is a boo-boo from my Orc work, and
the second might be contentious to some (but is right imho).

Cheers,
Arun