Resolve compiler errors due to changes in scala-ide master