various fix for XXX_all