Fixed inconsistent return types
12 files changed