more notice fixes - been doing this for a long time...