More launcher and bundle adjustments