Fixed things to work across multiple 7221s