Changes to make joins work.