Made some options not GUI-specific