Fixed Manifest and removed warnings