Some BugFixes from MicroServices