* fix(services): update accessor fns [EE-5464] * small fixes --------- Co-authored-by: testa113 <testa113>