Fixed Manifest dependency errors that were introduced in refactoring