Fixed osp, reporting, etc

Fixed osp, reporting, etc