Some utility updates.