Fix value objects