Follow-up fixes for #112#116

MikeTheGreat wants to merge 2 commits into

RaphGL:masterRaphGL/Tuckr:masterfrom

MikeTheGreat:mikep-from-stow-follow-upMikeTheGreat/Tuckr:mikep-from-stow-follow-upCopy head branch name to clipboard