Remove some Eclipse warnings