Join Condition Bug Fixes and other minor improvement.