Minor issues

Fix minor issues introduced in #368.