Fix namespace and override errors