fixes #469 - service development experience fixes