some notices fixes