Sync fixes with the newest version