MODE-2076 Additional fixes for errors.