Workaround new Eclipse plugin and some other improvements