Fix some set_data/extensions issues

I missed these issues in previous passes.