Notices fixes