Fixed possible notices