Using hostname everywhere in variable
More fixes