Fix for join
Fix for root_path tweak