Fix skeptic issues