ahlstromcj Minor fixes plus issue #222.