Fixes for eclipse e4.