Fix up some issues that were noticed while annotating