square check fixes