1.6 pending fixes