Ensure clean exit after install