Various namespace and interface fixes