Fix bulk messages