Fix namespace and so on