Fix compile errors due to namespace changes (utils -> common)