Fixes to the manifest and offlining