Further fixes to image sending