Various updates to remove Eclipse warnings