Merge "Revert "Revert "Fix eclipse warnings"""