Ensuring ever object is available in a factory & other misc bugfixes