Assembly unloading fixes