Small changes (strict notices)