Fix -Yno-adapted-args compiler warnings