Updated more modules to the new logging convention