MODE-1745 Minor changes and additional debug statements