Fix a few things that broke.