Changes/fixes made to sort out DCS validation issues