Minor changes for #29