more rectangle fixes