Partial fix of Eclipse build.