Address code review comments and keep Eclipse compatibility