Couple of fixes.
Ignore case and some message updates.