Fix another portion of notices