Minor fixes to return values.