Fix namespace handling.