Fix rendering bugs with reverse references