Some cosmetic changes when <SID> is missing to have some sane output
remove unneeded XFS warnings