Fixed bugs in Value Objects and other things