Fix issues that cropped up using in practice#20

hildjj merged 1 commit intocto-af:maincto-af/create:mainfrom

hildjj:experiencehildjj/create:experienceCopy head branch name to clipboard