Corrected some return values