fixing some more indirection bugs