CheckStyle and FindBugs fixes