Annotating some more setup variables