Misc fixes for Eclipse.