Resolve compiler errors due to code changes in scala-ide master