Correct mis-matched return types