WIP Some fixes in INNER JOIN