More fixes related to namespace changes