[feature/module_services] Fix minor issues in changed files