Fixed return warnings