Task/392 service path fixes for pre merged pr

### Description
A few fixes that were overlooked in the previous PR #411