Fixing some returning values.