Minor updates due to namespace change