Canister fixes from Bay.