Update serve

Minor helper script improvements
Merge pull request #2304 from sergeyklay/patch-2

Update serve