Refresh standlone patch to avoid fuzz and offsets
