Item square partial bugfixes