Minor updates for issues found while testing