Fix use of deprecated APIs