Fixed final field generation in builder