Fix some Unloading Bugs.: