Ops, adding suggested fixes