Added remaining compc options.