Minor updates

Related to #192 and #285