Fixed some factory things