Fixes of deprecated fields in 3.0