Fixed pipeline, Made changes to deal with some PMD errors