Fix channels not unloading / video skipping
A few small improvements