CA-147453, CA-147822: xsifstat fixes