More notice fixes