Field : some small tweaks to increase performance and, correctness in the new factories