Bug fixes for multiple table joins.