Corrected errors that occurred during refactoring and packaging