Fix some return values.