Fix banhammer bugs