small cleanups to keep cane happy