Checkstyle fix
Adding xml encoding
Checkstyle fix
Minor fix