Fix outstanding returnmessage issues