More fixes for incorrect return types/values.