Fix some problems introduced by the namespace change