notices fixes