Corrections after namespace changes