some notice fixes