Latest fixes and CL progress.