Minor changes to new code.