Fixed: Some bugs from FindBugs :)