Fix more incompatibilities, i.e. set vs {}