More progress with fixing errors.