message delivery fixes