Inconsistent return types: mostly TODOs, some fixes