[dq8] Two minor improvements.