Fixing libs issues and updating Manifest