fix ban upgrade closes #2239
closes #2234
closes #2240