re usecase matrix fixes...