Follow up to build failures - SXS-20