Removal of effc++ warnings