fixes by Emer