Fix warnings, serialVersionUID added