Minor changes to accomodate gotrntmessages pkg