More sentiment fixes