Fix more form deprecations