[dq8] More small tweaks.