Fix broken options references

Fixes some references accidentally broken in recent refactoring.