Minor issues related to #140