More build fixes after options refactor.