O&M improvements