MODE-2344: Small fixes