Fix deprecation warnings for defaults