A couple of notice fixes

A couple of notice fixes