Fixed multiple matrix type consistencies.