syntax fixes from join group pr