remove retval_adr, minor changes