Fix deprecations for {}, use Compat