options.model specific fixes