minor namespace and matrix type fixes