Fixed: Some issues and FindBugs/Checksytle issues