Latest O&M fixes