r8896: more changes