Couple namepace fixes