Minor changes

Bug fixes:

• Internal Service unstable - hotfixed before issues were surfacing on live environment.