Fixes for Makefile issues and other minor bugs, including calling the wrong factory.