Fixing some issues found via mailing list.