correct some return values