Fixed a couple of bugs when loading the module into a new project