Fixes in factory