Additional notice fixes and comments