Fix more return types.