Miscellaneous fixes to get Eclipse MAT workflow working better