[CCL] Fix wrong rectangle connection and reversed x coordinate