Fixed issue with plugin order changinh
Fixed all plugins so that they can be unloaded