Fix deprecation warnings for should