Pending minor fixes.