Fix issues with non-blocking scalar writes.