Additions to "Fix small issues"