Fix miscellaneous cane violations