XD-1593 minor fixes re. MF initial review