Minor q8 cleanup