Some small bleeding jumbo fixes