Fix up problems caused by namespace migration