Messages ordering fixes