Indirection and bug fixes