Additional fixes to ResultList