Incorporate comments from Ermal's review of 2.5.5