Fix a bunch of broken modules