Minor changes from PR # 72