Minor edits to setup