Fix a few dead assignments