Updated some fixes to sender