Various pending fixes.