Fixed some PMD and find bugs errors