Couple of notice fixes