Fix kernel model masking and improve defaults.