Fix some JOIN and PART breakage