Fixed eclipse warnings