Address pipeline failure

Fix issues related to linting and pipeline failure