Update to current issues