Cleaned up a couple more warnings reported in issue #138