Minimal changes to get issues code working.