Fix a few things to make sure that the current module doesn't break anything