Lots of Notice Fixes