Correct some issues with being banned. See #658 which may be relevant