Merge a round of fixes from servicemap build system