Fix issue #90.
Fix warnings.