Casting to help 2.10, plus fix with synthetic fields.