A few changes to fix broken namespace references