Fixing Project Manifest and some runtime errors