Added reasonable default entry trace; fixed bad ODFI logic