Check-manifest fixes