Jinx cluster fixes.