Fixed self hosting