068.02 Minor changes ported in from G1