various fixes for new subdist interface