Fixed notices further