Fix issues with Show Labels in Squarish mode