Fixed a few more box from the sepration of modules