Fix some return values
4 files changed