More changes to load emacs as server