Fixes in namespace declarations