Changes to clean up MacOSX warnings reported in issue #138