More multislice/odometer fixes