Fixed DO Code issues