Additional fixes for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205

Change-Id: I0000000000000000000000000000000000000000
3 files changed