Fixed remap stuff and module unloading