Cleaned up all but one warning reported in issue #138