Fix deprecation/unused_variable warnings