a few manifest-related cleanups