Small changes for #81 and #82