[software-management-guide/rebase] Minor fixes