Fix cane issues