Clean up namespace problems