Fix minor namespace breakage