0000506: Single xml solution - fixed stuff pointed out by Ablu