few bug fixes with localhost names